intermittent pull request

updates to recent master