Initial import.
Merge branch 'blmeTweaks'