Sync'd branch releases/beta with upstream @ Thu Oct 16 18:38:40 PDT 2014