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