Merge tag 'v1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 22:19:19 +0000 (17:19 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 22:19:19 +0000 (17:19 -0500)
v1.0.5


Trivial merge