[GIT PULL] Reset controller fixes for v3.15

[Philipp Zabel]

Hi Olof,

Am Montag, den 26.05.2014, 12:17 -0700 schrieb Olof Johansson:
> Hi,
> 
> Please use signed tags on pull requests. It gives you a good location to
> document what is in it, as well as us a chance to verify that it actually comes
> from you (if/once your key is signed by people).

Alright, I'll do so in the future.

> In this case, I don't see any in-tree users of the function in 3.15, and we're
> very late in the merge window, so I've added this to the fixes-non-critical
> branch for 3.16.

Just as well, thank you.
Philipp