Merge conflicts
Merge branch 'master' of github.com:amedia/checkpoint
Merge conflicts.