Merge branch 'master' into 8183-projects-dropdown
authorradhika <radhika@curoverse.com>
Mon, 15 Feb 2016 16:29:04 +0000 (11:29 -0500)
committerradhika <radhika@curoverse.com>
Mon, 15 Feb 2016 16:29:04 +0000 (11:29 -0500)

Trivial merge