Merge branch 'hotfix/1.3.3' v1.3.3
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jun 2015 15:13:34 +0000 (11:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jun 2015 15:13:34 +0000 (11:13 -0400)

Trivial merge