BUG: take into account adjoin width, closes #3201
Note: Travis is failing due to earlier build from today failing, rebase to latest should fix.
 @hayd indeed
 Ok to merge this? I would like to include it when finishing on #2881.
