Automatic Checkpointing
Merge remote-tracking branch 'origin/checkpointing' into master-0.8