changed a comment
Merge remote-tracking branch 'origin/op-test' into deployable.2014.07.23