Merge pull request #615 from SvenRoederer/for-15.05_openwrt