Merge branch 'hotfix/1.5.12' v1.5.12
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 15:54:29 +0000 (11:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 15:54:29 +0000 (11:54 -0400)

Trivial merge