Nightmare Gov. removed white spaces
Nightmare gov. some little changes!
Merge remote-tracking branch 'dorimanx/master-jelly-bean' into master-3.0.y

+ ...