Merge pull request #564 from pusewicz/use-cf-static-assert