[NRY] Merge in colony-luajit branch.