Merge tag 'v2.0.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 26 May 2016 21:21:22 +0000 (17:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 26 May 2016 21:21:22 +0000 (17:21 -0400)
v2.0.1


Trivial merge