Sync'd branch releases/beta with upstream @ Tue Nov 11 07:37:56 PST 2014