Apache master merge 2014/08/13

Merge of apache master