Sync'd branch releases/beta with upstream @ Sun Nov  2 15:56:28 PST 2014