Sync'd branch integration/inbound with upstream @ Sun Oct 12 20:51:47 PDT 2014