Merge on 2014-06-12