Sync'd branch integration/inbound with upstream @ Wed Nov 12 23:31:03 PST 2014