Develop

The branches bulldozer, haswell, piledriver and armv7 are merged