Merge pull request #66 from jamesiarmes/2.x

[#58683852] Fixed 1.x client namespace.
[#58683852] Fix notices
Merge pull request #67 from dbehrman/notices_2x

[#58683852] Fix notices