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