Merge branch 'hotfix/1.4.5' v1.4.5
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 20:51:02 +0000 (15:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 20:51:02 +0000 (15:51 -0500)

Trivial merge