Updated to upstream CVS sources as of 2014.04.30