Sync'd branch integration/inbound with upstream @ Fri Nov  7 05:22:43 PST 2014