Merge branch 'master' into brooklyn-api-convenience-better-error-propagation