Merge branch 'release/1.1.24' v1.1.24
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:42:06 +0000 (09:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:42:06 +0000 (09:42 -0400)

Trivial merge