Johan Ström - 2015-11-09

+1 for this merge. I've been using it on my dev bus for quite a while now, and works very stable.

I have commit privileges to the main branch, so if no-one comments against this in a few days I could ahead and merge it.