Can someone confirm that removing the \<all> tags is correct?
@matthewkumar, Terry and I are not sure about the conflicts we're seeing - were these fixes already made in the master branch AFTER this pull request?