Closes #490.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ncc/typing/Solver.n