Merge branch 'master' into lazy-data-structures