Merged in edrikk/tomato-arm-ddwrt-kong-cherrypicks (pull request #13)