Finally fixed the ido-ubiquitous startup bug
Merge remote branch 'refs/remotes/origin/jn-big' into new-master