Merge branch 'rel-15.09'