Merged Coral's bidness.

Signed-off-by: Joshua Evans <eDarktha@gmail.com>