Sync'd branch releases/beta with upstream @ Sun Nov  2 17:59:29 PST 2014