Otw bug fix
Merge remote-tracking branch 'doug/master'

Conflicts:
	doc/changeLogs/changeLog.txt
resolving c++ cast issues; but not tested
branch merge