Merge branch '3.1.x'

This commit is contained in:
Marc Alexander 2015-10-08 17:21:57 +02:00
commit 8f10212f38