integrate changes from slarge svn
Merge branch 'master' into 0start-reset