re-opening since it seems that branch never actually got merged. branch is also woefully out of date so cant be merged to trunk as-is.
re-opening since it seems that branch never actually got merged. branch is also woefully out of date so cant be merged to trunk as-is.