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