Merge branch 'release/2.9.1' v2.9.1
authorLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 21:19:45 +0000 (16:19 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 21:19:45 +0000 (16:19 -0500)

Trivial merge