Sync'd branch integration/inbound with upstream @ Sun Nov  9 16:40:56 PST 2014