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

3.6/dev intrepid svoigt