Merge remote-tracking branch 'origin/master'
Fixed iron router header yield issue