minor housekeeping leftovers: adapts->@adapter, each import on one line
Merge remote-tracking branch 'remotes/origin/master'