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

Trivial merge