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