Merge branch 'hotfix/1.2.15' v1.2.15
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 6 Jul 2016 21:01:35 +0000 (17:01 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 6 Jul 2016 21:01:35 +0000 (17:01 -0400)

Trivial merge