Merging branch/2014-01-17/cbs-tract-alloc into master.