upgrade to 1.1.70
Merge branch 'master' into reporting