Reduce number of history to silence error
Merge branch 'master' into netbook