Sync'd branch integration/inbound with upstream @ Fri Nov  7 10:13:57 PST 2014