Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-12-03 11:10:52 +00:00
commit 0e09408f91