Merged from SVN.
Merge branch 'develop' into refactor