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