Sync'd branch integration/inbound with upstream @ Sun Oct  5 21:31:37 PDT 2014