Sync'd branch releases/beta with upstream @ Thu Oct 16 05:11:46 PDT 2014