Fix python 2.6 string formatting incompatibility.
Fix python 2.6 string formatting incompatibility.
Resolve merge