Release 15

@nandy @rogatty Let's backport release branch to dev since we did some quick fixes there and they should be compliant.