Stop jumping thru hoops w/offset
Merge remote-tracking branch 'origin/master'