Related to #12, but broken by the platform bug #1033309.
Merge remote-tracking branch 'origin/master' into iss#12