Merge "Upgrade ietf-{inet,yang}-types to 2013-07-15"