Merge branch 'release/1.0.13' v1.0.13
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 21:23:41 +0000 (16:23 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 21:23:41 +0000 (16:23 -0500)

Trivial merge