[Apache Merge]20141229

Apache merge on 20141229