Merge pull request #266

More features from the Concurrency Strawman

Conflicts:
	q.js