Pull request for 20140626 deployment

See change list for Jira tickets involved.