Merge proposals dependent on lp:~herron-philip/silix/onak-dev

lp:~herron-philip/silix/onak-dev has no merge proposals.