fix philly and santa fe
Merge remote-tracking branch 'origin/master'