Sync'd branch releases/beta with upstream @ Tue Oct 28 07:17:40 PDT 2014