Merge remote-tracking branch 'robert/master' into robert-master
some toggle testing
fixed conflict