finishing script administration
Merge remote-tracking branch 'origin/namespacing' into namespacing