formhub commits

pull in commits from recent formhub prs