Sync'd branch integration/inbound with upstream @ Sat Oct 25 12:32:40 PDT 2014