Proposed merges from UMICH branch to trunk

Please refer to JIRA for latest status