Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-09-30 21:49:41 +01:00
commit 0b1d7cc53f
No known key found for this signature in database
GPG key ID: 50E0D2423696F995