Merge branch '3.1.x'

This commit is contained in:
Marc Alexander 2015-06-05 10:05:50 +02:00
commit c8ccae7a7c