merging in latest changes from trunk, up to r15854 (editor starts without issues)