Merge tag 'v1.2.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Apr 2016 16:48:44 +0000 (12:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Apr 2016 16:48:44 +0000 (12:48 -0400)
Version 1.2.5


Trivial merge