Last modified: 2014-01-22 20:24:14 UTC
Done in I8f84a9ae277e5093356f591f7a56e8cebf4a1893.
Verified the fix in test2