fix for spec that occassionally breaks due to timing
Merge branch 'master' into upgrades