Merge tag 'v2.5.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Aug 2016 16:32:32 +0000 (12:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Aug 2016 16:32:32 +0000 (12:32 -0400)
v2.5.1


Trivial merge