cr 609340+cr607192

CGI by Saturday night coder.