Merge branch 'hotfix/1.2.13' v1.2.13
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Jun 2016 17:05:20 +0000 (13:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Jun 2016 17:05:20 +0000 (13:05 -0400)

Trivial merge