Improved way editors are resolved
Autocommit Sat Dec 20 11:07:10 EST 2014