Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2016-01-12 10:17:21 +00:00
commit 2aff82bb64
6 changed files with 32 additions and 32 deletions