Merge branch 'hotfix/1.4.5' v1.4.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Apr 2015 15:33:23 +0000 (11:33 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Apr 2015 15:33:23 +0000 (11:33 -0400)

Trivial merge