Improved comment/uncomment to deal properly with pep8 formatting.
Minor
Fixed issue on Ctrl+1 assist to ignore some warning.
Merge branch 'fabioz_dev' into development