Merge tag 'v1.2.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 14:51:55 +0000 (09:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 14:51:55 +0000 (09:51 -0500)
Version 1.2.5


Trivial merge