Merge branch 'release-0.2.1' into develop

Seto Elkahfi committed Apr 24, 2017 at 16:15 UTC bc807152a58bbe90681fb8783f4c77e496e249d8

No changes.