Updated from private repo as of 2014-08-29.