Improved way editors are resolved
Autocommit Fri Dec 19 18:32:04 EST 2014