Fix for Linaro 4.8