Merge branch 'hotfix/1.0.13' v1.0.13
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 18:21:08 +0000 (13:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 18:21:08 +0000 (13:21 -0500)

Trivial merge