Merge branch 'master' into 10604-crunch2-user-guide
authorradhika <radhika@curoverse.com>
Tue, 6 Dec 2016 15:31:50 +0000 (10:31 -0500)
committerradhika <radhika@curoverse.com>
Tue, 6 Dec 2016 15:31:50 +0000 (10:31 -0500)

Trivial merge