Merge tag 'v1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 19:28:54 +0000 (15:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 19:28:54 +0000 (15:28 -0400)
v1.0.5


Trivial merge