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