Merge branch 'hotfix/1.4.6' v1.4.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Apr 2015 15:49:16 +0000 (11:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Apr 2015 15:49:16 +0000 (11:49 -0400)

Trivial merge