Commit 4d7b993904008001ad995d6b27af0e8c71277c55

Jacques Germishuys 2014-04-01T22:18:19

Added cherry-pick support