Merge branch 'hotfix/2.1.14' v2.1.14
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:55:42 +0000 (17:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:55:42 +0000 (17:55 -0400)

Trivial merge