Commits in cv-2017/ht-samakapa:master