AID-260 Updated to use new logging scheme.
Merge branch 'master' of github.com:amedia/checkpoint