Merge pull request #490 from davidvossel/master

xml schema change cleanup
Build: xml: INFINITY could overflow for 16-bit ints - explicitly cast it