Merge branch 'hotfix/1.2.15'
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 15:39:54 +0000 (10:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 15:39:54 +0000 (10:39 -0500)

Trivial merge