Update 2 from main repository 2014-11-19