Merge remote-tracking branch 'apache/master' into gsoc-2018