Sync'd branch releases/beta with upstream @ Wed Oct  1 14:09:32 PDT 2014