Sync'd branch integration/inbound with upstream @ Fri Oct 10 14:12:40 PDT 2014