Merge branch 'rebasedlg-conflict-deleted-refresh' of https://code.google.com/r/ch3coo...