Merge branch 'hotfix/1.0.15' v1.0.15
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 18 Feb 2016 19:50:01 +0000 (14:50 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 18 Feb 2016 19:50:01 +0000 (14:50 -0500)

Trivial merge