floor limitations on actions
Merge remote-tracking branch 'origin/24042014' into 24042014