Updated to Default Content 1.0-alpha7 (defaultcontent). N.B. Probably ready to be moved to contrib after some testing.