Done for today, bugless and running on my G2
Merge remote-tracking branch 'origin/master'