upstream/6.1.1_pre1

David Bremner

@bremner

3d71d0f8 · Merge remote-tracking branch 'github/release' into upstream · Oct 16, 2014

snapshot from upstream release branch