Pulling updates from nitrous-io:master

Pulling and merging updates from upstream