517
Merge branch 'master' of github.com:dankelley/oce-issues

Conflicts:
	517/517B.R