Test commit. Add 2011 to copyright line (merge from 2.5).