Sync'd branch integration/inbound with upstream @ Wed Nov 12 21:37:58 PST 2014