Merge branch 'release/1.0.5' V1.0.5 V1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jul 2015 15:34:36 +0000 (11:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jul 2015 15:34:36 +0000 (11:34 -0400)

Trivial merge