Merge branch 'hotfix/1.1.16' v1.1.16
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 18:47:15 +0000 (14:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 18:47:15 +0000 (14:47 -0400)

Trivial merge