Merge branch terrible and branch awful

UCC git Repository :: git.ucc.asn.au