Sync'd branch integration/inbound with upstream @ Mon Nov  3 00:22:48 PST 2014