Commit 103b7d21226e43192cf138ecf0b98b51796ae0ed

Jacques Germishuys 2014-04-02T13:57:11

Added cherry pick tests