Sync'd branch integration/inbound with upstream @ Sun Oct 19 19:33:16 PDT 2014