Add border to cancel button
Replace absolute file path separator with forward slash, to be consistent with URL formatting
Merge remote-tracking branch upstream/$:{upbranch}