Autocommit: syntax map changed 2013-09-05-16:32:15

Manually picked from auto-commit 288f099f4bd80717923bbcf5287cf1291036bf75