Sync up to Marlin

Pull request to sync up my repository to Marlin.