Sync'd branch integration/inbound with upstream @ Sun Nov  9 11:29:05 PST 2014