Sync'd branch releases/beta with upstream @ Tue Sep 16 05:11:36 PDT 2014