Merge from 3.5; no changes to 3.6

This commit is contained in:
Martin Panter 2016-06-08 12:45:30 +00:00
commit 7764f4d12c

Diff content is not available