Pull request id bundles/e1f67e97676aa98754e159485c9d24e22bc9901e merged upstream.
Pull request id singletons/crowbar/crowbar/1678 merged upstream.