Added changes up to 2014-11-04