Swapped out branch to sync with Master for gh-pages

Swapped out branch to sync with Master for gh-pages