Merge branch 'release/1.5.9' master V1.5.9
authorLaury GvR <laury@gaslightmedia.com>
Wed, 3 May 2017 19:38:32 +0000 (15:38 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 3 May 2017 19:38:32 +0000 (15:38 -0400)

Trivial merge