Merge branch 'release/1.0.7' v1.0.7
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 13 Jan 2017 18:24:17 +0000 (13:24 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 13 Jan 2017 18:24:17 +0000 (13:24 -0500)

Trivial merge