Merge pull request #2741 from alarcher/release_2017