commit of svn trunk as fetched on 2013-10-2
Merge branch 'trunk-2013-10-2'