Merge branch 'hotfix/1.2.33'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 8 Dec 2014 17:41:20 +0000 (12:41 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 8 Dec 2014 17:41:20 +0000 (12:41 -0500)

Trivial merge