Merge branch 'hotfix/1.2.34' v1.2.34
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Jan 2015 16:51:18 +0000 (11:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Jan 2015 16:51:18 +0000 (11:51 -0500)

Trivial merge