Merge branch 'release/2.5.1' v2.5.1
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Aug 2016 16:32:24 +0000 (12:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Aug 2016 16:32:24 +0000 (12:32 -0400)

Trivial merge