Merge branch 'master' into 6466-disable-public-projects
authorManoj <jonam33@gmail.com>
Tue, 7 Jul 2015 13:07:33 +0000 (09:07 -0400)
committerManoj <jonam33@gmail.com>
Tue, 7 Jul 2015 13:07:33 +0000 (09:07 -0400)

Trivial merge