Merge branch 'master' into 8286-fav-projects
authorradhika <radhika@curoverse.com>
Wed, 10 Feb 2016 17:55:22 +0000 (12:55 -0500)
committerradhika <radhika@curoverse.com>
Wed, 10 Feb 2016 17:55:22 +0000 (12:55 -0500)

Trivial merge