Merge tag 'v1.2.34' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Jan 2015 16:51:30 +0000 (11:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Jan 2015 16:51:30 +0000 (11:51 -0500)
Version 1.2.34


Trivial merge