Merge branch 'hotfix/1.1.33' v1.1.33
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 13:37:06 +0000 (09:37 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 13:37:06 +0000 (09:37 -0400)

Trivial merge