Sync'd branch releases/beta with upstream @ Sat Sep 27 11:44:39 PDT 2014