Support Haiti
Merge branch 'haiti' into custom