copyrights: 2012 => 2013
Merge branch 'master' into multidirs