Preventing simultaneous vertical an horizontal dragging.
Merge branch 'master' into iOS7StatusBar