Update-20140618-2

Managed conflict