2016-10-25 Will Schmidt <will_schmidt@vnet.ibm.com>