Sync'd branch releases/beta with upstream @ Sun Oct 26 16:19:38 PDT 2014