Merge branch 'master' into core-updates
authorLeo Famulari <leo@famulari.name>
Thu, 18 Aug 2016 04:05:50 +0000 (00:05 -0400)
committerLeo Famulari <leo@famulari.name>
Thu, 18 Aug 2016 04:06:56 +0000 (00:06 -0400)

Trivial merge