integration of amsterdam changes for v 5.0
integration of amsterdam changes for v 6.0
integration of amsterdam changes for v 6.5
integration of amsterdam changes for v 6.7
integration of amsterdam changes for v 6.8
Merge pull request #1 from magchips/integration

Integration: update master to amsterdam version 6.8