typo
Update copyright notice to 2013.
Merge branch 'develop' into dirty-disable