Successfully rebased 'master' onto 'formatting'