2015-07-09 - production
19:53	<legoktm>	manually fixing global merge of Yuvipanda->YuviPanda (T104686)	[production]