Update to the 2014-21a release

Fix for an infinite loop when outputting an expression string