Merge proposals dependent on lp:~josejuan-sanchez/jhelioviewer/soc

lp:~josejuan-sanchez/jhelioviewer/soc has no merge proposals.