Merge changes in from chapel-lang.

Trying something out...