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