Updated to include minified version of changes from #4