merge copying/running automation code from trunk into live site