Merge remote-tracking branch 'anarcat/inline_diffs'