merging the rename-scheduler branch back to the trunk; the branch is now dead. this closes #1952
the branch is now dead