2014-05-20 merge from new Stable/icehouse