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

Trivial merge