Merge from loopj/master