Merge tag 'v1.2.40' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Apr 2015 13:44:22 +0000 (09:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Apr 2015 13:44:22 +0000 (09:44 -0400)
Version 1.2.40


Trivial merge