Merge branch 'lp-offset-twoside'