From a06838166da7ad44123f03bbb5a9c3ad3074a0c7 Mon Sep 17 00:00:00 2001
From: Graham Mainwaring <graham@mhn.org>
Date: Tue, 5 Jan 2016 17:30:47 -0500
Subject: [PATCH] Merge pull request #580 from ghjm/devel

Remove update of setuptools