Properly handle PBS' -q argument.
Merge stable.