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