Sync'd branch integration/inbound with upstream @ Sat Oct 25 14:42:41 PDT 2014