Merge branch 'hotfix/1.2.36' v1.2.36
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Apr 2015 12:46:30 +0000 (08:46 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Apr 2015 12:46:30 +0000 (08:46 -0400)

Trivial merge