Merge branch 'hotfix/1.0.16' v1.0.16
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 18:26:31 +0000 (14:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 18:26:31 +0000 (14:26 -0400)

Trivial merge