Bastion - Merging master into branch.