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