Merge branch 'averangeall', remote-tracking branch 'origin/averangeall' into averangeall