more work on NC
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/common.h
small stuff on NC
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/common.h
not that much to say here.
Merge remote-tracking branch 'origin/master'