fix typo, update (c) year
merge master