test upstream
merge in changes to histobook
Merge remote-tracking branch 'upstream/master'
starting m2 measurement