slfritchie Merge branch 'slf/perf-improvements1' into tmp/merge-delme

Latest commit e87bd59

Mar 29, 2016