Sync'd branch releases/beta with upstream @ Tue Nov 11 18:28:48 PST 2014