Merge tag 'v1.2.35' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 20:06:15 +0000 (15:06 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 20:06:15 +0000 (15:06 -0500)
Version 1.2.35


Trivial merge