Merge branch 'release-0.2.0' into develop

Seto Elkahfi committed Apr 8, 2017 at 19:32 UTC 1bce84c39e4a34a67744bdf4130fa02ce260e9c6

No changes.