Changes to 20140606-1541