Sync'd branch integration/inbound with upstream @ Fri Oct 10 05:24:38 PDT 2014