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