20140922
Fixed merge conflict