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