Merge "Update formatting for includes/specialpage"