Merge branch 'master' into 8286-fav-projects
authorradhika <radhika@curoverse.com>
Tue, 16 Feb 2016 02:33:01 +0000 (21:33 -0500)
committerradhika <radhika@curoverse.com>
Tue, 16 Feb 2016 02:33:01 +0000 (21:33 -0500)

Trivial merge