Sync'd branch integration/inbound with upstream @ Sun Oct  5 10:03:43 PDT 2014