Merge branch 'master' into v0.12.0.x

This commit is contained in:
Holger Schinzel 2015-09-04 10:37:10 +02:00
commit 6cf5a25e2b

Diff Content Not Available