Dont rebase trunk if notrunk option is set
Merge remote-tracking branch 'origin/pr/62'