Merge branch 'HEAD', remote-tracking branch 'linaro/linaro-master'