Merge branch 'release/r20141106'