merging master to ohmage-2.16 since ohmage project prefers commits to the version branch