Merge branch 'develop' into feature/insight (run by )
Merge branch 'master' into feature/insight (run by anonymous)
Merge branch 'feature/insight' into master (run by Sean Moe)
Merge pull request #261 from adaptivecomputing/master

Merge master into dynamic nodes