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