Sync'd branch releases/beta with upstream @ Fri Sep  5 06:47:38 PDT 2014