Merge tag 'v1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 14:19:20 +0000 (09:19 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 14:19:20 +0000 (09:19 -0500)
1.0.5


Trivial merge