Apache master merge 2014/08/19

apache master