Merge tag 'v1.0.7' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:12:28 +0000 (15:12 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:12:28 +0000 (15:12 -0500)
1.0.7


Trivial merge