Merge 'rg3/master' into fork_master