Merge branch 'release/0.1.1' into develop
update test timeout

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>
Merge branch 'develop'