Sync'd branch releases/beta with upstream @ Tue Sep 23 11:02:33 PDT 2014