Sync'd branch integration/inbound with upstream @ Sat Oct 18 17:44:41 PDT 2014