GCI-9 #2

Accidentally set the base branch as master. Sending to gci-2014.