Some Nightmare Governor Adjustments :)
Merge remote-tracking branch 'dorimanx/master-jelly-bean' into master-3.0.y

+ ...