all
Merge branch 'master', remote-tracking branch 'origin'

Conflicts: