Merge branch 'hotfix/1.0.13' v1.0.13
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Nov 2015 21:19:15 +0000 (16:19 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Nov 2015 21:19:15 +0000 (16:19 -0500)

Trivial merge