Merge branch '2016-06' into building-r
authorGreg Wilson <gvwilson@third-bit.com>
Thu, 23 Jun 2016 21:03:27 +0000 (17:03 -0400)
committerGreg Wilson <gvwilson@third-bit.com>
Thu, 23 Jun 2016 21:03:27 +0000 (17:03 -0400)

Trivial merge