Merge "Merge branch release-5-1 into release-2016" into release-2016