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