Sync'd branch integration/inbound with upstream @ Sun Oct 26 15:11:42 PDT 2014