Fixed issue #255 and #258.
Merge branch 'refs/heads/github/philjay/master' into github/rds/opensource