Merge branches 'lingo-without-fs' and 'plv8'