Merge branch 'jejb-fixes' into fixes
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 6 Jul 2016 14:25:55 +0000 (07:25 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 6 Jul 2016 14:25:55 +0000 (07:25 -0700)

Trivial merge