Merge tag 'v2.9.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 21:19:52 +0000 (16:19 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 21:19:52 +0000 (16:19 -0500)
v2.9.1


Trivial merge