Sync'd branch integration/inbound with upstream @ Sun Oct  5 23:44:46 PDT 2014