Merge branch 'hotfix/1.1.12' v1.1.12
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Mar 2017 14:51:25 +0000 (09:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Mar 2017 14:51:25 +0000 (09:51 -0500)

Trivial merge