Minor fixes for Firefox 28 regarding AutomaticScenarioGeneration, still not done
Merge remote-tracking branch 'origin/master'