Merge branch 'upstream'
authorDon Armstrong <don@donarmstrong.com>
Fri, 7 Aug 2015 02:59:20 +0000 (19:59 -0700)
committerDon Armstrong <don@donarmstrong.com>
Fri, 7 Aug 2015 02:59:20 +0000 (19:59 -0700)

Trivial merge