Merge tag '3.6.0' into 3.6

Release 3.6.0
This commit is contained in:
Daniel Hensby 2017-05-30 23:49:34 +01:00
commit ed34be06c1
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

Diff Content Not Available