Sync'd branch integration/inbound with upstream @ Mon Nov 10 23:42:53 PST 2014