Merge branches 'cpphs', 'curses' and 'macosx-travis' into macosx

Conflicts:
	.travis.yml