merged master into this branch, and resolved conflicts to keep comments in the routes file, and to keep enumeration routes as well