Merge with branch of thang + fix for wpengine