Based on the 6.1 files, but without any 6.6 additions. Signed-off-by: Mathew McBride <matt@traverse.com.au>