Ash/13w41 fixes

Brnach ash/13w41-fixes contains fixes for 13w41 , please review it and merge in 13w41-fixes .

From Monday onwards i will start my work on ash/13w42-fixes.