Merge 64-bit fix from linksys branch