Sync'd branch integration/inbound with upstream @ Sun Nov  2 23:53:46 PST 2014