Sync'd branch integration/inbound with upstream @ Sat Oct 11 10:26:41 PDT 2014