Merge branch 'master' into 10786-remove-centos6-from-build-directory
authorWard Vandewege <ward@curoverse.com>
Sat, 31 Dec 2016 20:20:11 +0000 (15:20 -0500)
committerWard Vandewege <ward@curoverse.com>
Sat, 31 Dec 2016 20:20:11 +0000 (15:20 -0500)

Trivial merge