Merge branch 'hotfix/1.3.12' v1.3.12
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 21:15:32 +0000 (16:15 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 21:15:32 +0000 (16:15 -0500)

Trivial merge