2016-12-19 Will Schmidt <will_schmidt@vnet.ibm.com>