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