Pull request id bundles/62e31e1f5aff1d3c82c9d2a90e03538aab1f148c merged upstream.
Pull request id singletons/crowbar/crowbar/1681 merged upstream.