Merge master and branch for G5K