jbrichau Merge pull request #1365 from SeasideSt/turbo