Merge branch '3.1.x'

This commit is contained in:
Joas Schilling 2015-02-24 20:44:37 +01:00
commit 17b00812a7