Returned the comment to DisplayCaps
Merge remote-tracking branch 'origin/master'