@tnorthcutt @DeFries @jpetersen I think some of the admin changes assume trunk, mp6 is where the ui testing for 3.6 was pushed to