Merge release/V2.5-EA2 into master.

This commit is contained in:
Tom Page
2016-08-11 10:08:20 +01:00