Update 1 from main repository 2014-11-19