Merge tag 'v1.2.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 18:40:37 +0000 (14:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 18:40:37 +0000 (14:40 -0400)
Verlsion 1.2.5


Trivial merge