Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall
2016-04-18 13:41:41 +02:00