Merge branch 'master' into greedy2