Finish testing and fixes to a few small bugs.
Merge branch 'master' into dev
Merge branch 'master' into dev
Update copyright year.