Merge branch 'master' into core-updates
authorMark H Weaver <mhw@netris.org>
Mon, 28 Jul 2014 00:15:50 +0000 (20:15 -0400)
committerMark H Weaver <mhw@netris.org>
Mon, 28 Jul 2014 00:15:50 +0000 (20:15 -0400)

Trivial merge