Merge branch '10858-build-packages-improvements'
authorWard Vandewege <ward@curoverse.com>
Wed, 18 Jan 2017 02:54:58 +0000 (21:54 -0500)
committerWard Vandewege <ward@curoverse.com>
Wed, 18 Jan 2017 02:54:58 +0000 (21:54 -0500)
closes #10858


Trivial merge