Merge remote-tracking branch 'openwrt/for-15.05' into for-15.05