Synced to current code base to initialize the repo

Signed-off-by: Shane Gadsby <multimedia@usq.edu.au>