Merge branch 'master' into f27

tkrizek sent the 4.6.0 bump commit to master and f27 branches with
different commit IDs for some reason, merging back together with
the 4.6.0-2 changes.
This commit is contained in:
Adam Williamson 2017-09-06 08:28:53 -07:00
commit 74fd0309b7

Diff Content Not Available