1.0.0.20131108 (legacy)
Resolve merge conflict