Merge branch 'release/1.2.5' v1.2.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 18:40:30 +0000 (14:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 18:40:30 +0000 (14:40 -0400)

Trivial merge