Merge branch 'master' into 7607-getting-started-flag
authorradhika <radhika@curoverse.com>
Tue, 5 Jan 2016 22:37:08 +0000 (17:37 -0500)
committerradhika <radhika@curoverse.com>
Tue, 5 Jan 2016 22:37:08 +0000 (17:37 -0500)

Trivial merge