Merge branch 'hotfix/1.1.12' v1.1.12
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Jan 2017 18:39:55 +0000 (13:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Jan 2017 18:39:55 +0000 (13:39 -0500)

Trivial merge