changes pulled in from latest SVN
submodule