Search for new physics in high mass diphoton events in 3.3 fb-1 of proton-proton collisions at s=13 TeV and combined interpretation of searches at 8 TeV and 13 TeV