Merge branch 'master' into jpittman

Conflicts:
js/mtsAllocation.js