Done this now. See issue
https://issues.apache.org/jira/browse/FOR-1200

-David