Reviewed-by: forax, plevart, alanb
Contributed-by: NBen Evans &lt;benjamin.john.evans@gmail.com&gt;, Paul Sandoz <paul.sandoz@oracle.com>