Sync'd branch integration/inbound with upstream @ Sat Oct 11 23:01:38 PDT 2014