Manual merge of #330 from @jkimbo w/o built files.