small order of operations problem with bionic bart
Merge remote-tracking branch 'origin/master'