Sync'd branch releases/beta with upstream @ Tue Nov 11 14:22:50 PST 2014