Merge branch '1.0' into 1.1

This commit is contained in:
Daniel Hensby 2017-01-31 12:08:34 +00:00
commit cc58c0b741
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E