Sync'd branch integration/inbound with upstream @ Wed Nov 12 12:55:57 PST 2014