Merge branch 'release/0.1' into develop
Merge commit 'efd7c5b37d7661b36833d41d9e4ea4d39f242015' into develop