Merge remote-tracking branch 'remotes/aurel/tags/pull-sh4-next-20150612' into staging