Merge branch 'hotfix/1.2.33' v1.2.33
authorIan Weller <ian@gaslightmedia.com>
Fri, 16 Jan 2015 16:41:56 +0000 (11:41 -0500)
committerIan Weller <ian@gaslightmedia.com>
Fri, 16 Jan 2015 16:41:56 +0000 (11:41 -0500)

Trivial merge