sync to correct detached heads
merging in commit 'd1ff2d1'