master is upstream-master is now the integration branch, always stays green!