merge in changes from master and release-0-9-0