Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-03-30 19:01:12 +02:00
commit 073cf35422

Binary file not shown.