Merge master's changes into Swayam's security branch?