Sync'd branch releases/beta with upstream @ Tue Sep  9 16:55:34 PDT 2014