Rebase to v20140620

Integration of the changes from v20140620