Merge branch 'release/1.0.45' v1.0.45
authorLaury GvR <laury@gaslightmedia.com>
Mon, 25 Jul 2016 21:19:33 +0000 (17:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 25 Jul 2016 21:19:33 +0000 (17:19 -0400)

Trivial merge