Merge branch 'master' into v0.12.0.x

This commit is contained in:
Holger Schinzel 2015-09-04 16:38:54 +02:00
commit cabef59f33

Diff Content Not Available