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