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