master must in theory be always buildable.
@rafael or @tomo can you please accept or using master is not OK ?
