Sync'd branch releases/beta with upstream @ Thu Oct  9 21:27:50 PDT 2014