Merge commit 'egit/spearce/master' into rr/fetch_and_index