Merge remote-tracking branch 'privategit/master'