Sync'd branch releases/beta with upstream @ Tue Sep  2 09:43:30 PDT 2014