20140527
Merge ad/master