Sync'd branch releases/beta with upstream @ Wed Oct  1 11:00:31 PDT 2014