Track changes from webmachine/master

Will rebase later today if you want