Now uses old method of getting markers if pytest version is below 2.4.2
Merge remote-tracking branch 'origin/master'