Squashed commit of the following:

commit 881614a3e2ae2812380929bed36060ab4777493e
Author: Qian, Hai <hqian@gopivotal.com>
Date:   Mon Dec 22 17:05:40 2014 -0800

    Changed the maintainer from Hai Qian to Caleb Welton