some Swift beta 5 fixes, but b5 still has a bug that's stopping it from compiling regarding intervals
Merge remote-tracking branch 'origin/master'