Sync'd branch releases/beta with upstream @ Sun Sep 28 20:01:29 PDT 2014