Merge remote-tracking branch 'remotes/mwalle/tags/lm32-fixes/20141229' into staging