Release commit.
authorLaury GvR <laury@gaslightmedia.com>
Thu, 4 Jun 2015 21:26:48 +0000 (17:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 4 Jun 2015 21:26:48 +0000 (17:26 -0400)

Trivial merge