Sync'd branch integration/inbound with upstream @ Sun Oct  5 06:34:40 PDT 2014