Merging master to stable.