Merge branch 'release-0.2.0'

Seto Elkahfi committed Apr 8, 2017 at 19:26 UTC bd24393e928586a882221525bda5f6f926e4d4fb

No changes.