Correct trailing slash redirection in htaccess
Restored changes from mis-merge with master