Merges in latest commits from meteorhacks/fast-render