Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-10-01 20:35:17 +01:00
commit 1f9515cd31