Fix namespace declaration
Merge branch '1.3'