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