cip committed bc94f8d Dec 30, 2013