Merge tag 'v1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:26:03 +0000 (14:26 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:26:03 +0000 (14:26 -0500)
v1.0.5


Trivial merge