Sync'd branch integration/inbound with upstream @ Fri Oct  3 02:50:39 PDT 2014