Merge branch 'release/1.0.13' v1.0.13
authorLaury GvR <laury@gaslightmedia.com>
Wed, 1 Mar 2017 21:18:06 +0000 (16:18 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 1 Mar 2017 21:18:06 +0000 (16:18 -0500)

Trivial merge