Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Namespace fixed.
Merge branch 'mark'
Merge branch 'raymon'
Merge branch 'reinier'
Merge branch 'wybren'