Merge remote branch 'upstream/master' into bugfixes
Merge pull request #8 from dedeckeh/bugfixes

Don't rearm RS timer if callback is not set
Fix prefix detection for hybrid mode
Fix a segfault in state-script handling
Merge remote branch 'upstream/master'