Merge "Add a .htaccess for redirecting old paths"