Sync'd branch integration/inbound with upstream @ Sun Oct 26 14:43:51 PDT 2014