intermittent pull request

pulling in master stuff