Sync'd branch integration/inbound with upstream @ Sun Nov  9 23:20:54 PST 2014