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