Merge branch 'release/1.0' v1.0
authorLaury GvR <laury@gaslightmedia.com>
Wed, 26 Aug 2015 16:49:00 +0000 (12:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 26 Aug 2015 16:49:00 +0000 (12:49 -0400)

Trivial merge