Merge branch 'release-0.2.1'

Seto Elkahfi committed Apr 24, 2017 at 16:11 UTC ad681c259756f4514111130e977bb3821b9d7daa

No changes.