Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 21:55:40 +0000 (16:55 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 21:55:40 +0000 (16:55 -0500)
v1.0.2


Trivial merge