Merged branch 1.9 into 1.9

This commit is contained in:
Stuart Pomeroy 2016-03-28 11:47:56 +01:00
commit 6247a2093d