Merge branch 'hotfix/1.2.5' v1.2.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:40:10 +0000 (14:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:40:10 +0000 (14:40 -0500)

Trivial merge