Merge pull request #274 from MIT-Mobile/3.6/dev-intrepid-svoigt