Merge tag 'v1.2.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:40:18 +0000 (14:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:40:18 +0000 (14:40 -0500)
Version 1.2.5


Trivial merge