Merge pull request #321 from rlane/of14

Merge master into of14 branch

The C and Java backends are currently broken.