Merge branch 'hotfix/2.1.13' v2.1.13
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:51:50 +0000 (17:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:51:50 +0000 (17:51 -0400)

Trivial merge