Merge pull request #497 from agoddard/portland

Portland