Fixed weird behaviour on Opera 15
Merge branch 'opera15'