Patch by @sambler (Shane Ambler), with minor edits by myself (see also D727, T24055). Reviewed feature-side by @carter2422 (Jonathan Williamson).
Patch by @sambler (Shane Ambler), with minor edits by myself (see also D727, T24055). Reviewed feature-side by @carter2422 (Jonathan Williamson).