Sync'd branch releases/beta with upstream @ Thu Oct 23 09:18:58 PDT 2014