r1303 + even closer to a working 0.14.7 release, waiting for tests to succeed