Merged administration tasks between branches.

Merged administration tasks between branches. This is just for the initial setup of devel2.