Fix specs which fail on Qt 5.4
Merge remote-tracking branch 'origin/master'