Merge tag 'backport/v3.14/mach-shmobile-to-next-20140805' into backport/v3.14.12/snapshot-merge