SVN Import from version 3.1.1