Merge branch '1.1' into 2.0

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