Merge branch 'hotfix/1.2.35' v1.2.35
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 20:06:03 +0000 (15:06 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 20:06:03 +0000 (15:06 -0500)

Trivial merge