Activf2017 patch 3#6

activf2017 wants to merge 2 commits intomasteractivf2017/activf2017.github.io:masterfrom

activf2017-patch-3activf2017/activf2017.github.io:activf2017-patch-3Copy head branch name to clipboard