Sync'd branch releases/beta with upstream @ Tue Nov 11 13:06:47 PST 2014