Sync'd branch releases/beta with upstream @ Fri Sep 26 11:15:31 PDT 2014