Fix invasive console completion. closes #1972
Merge remote-tracking branch 'laarmen/fix_1972'