Merge tag 'backport/v3.14.24-ltsi-rc1/mach-shmobile-to-next-20150813' into backport/v3.14.28-ltsi+v3.14.50/snapshot-merge