Sync'd branch releases/beta with upstream @ Tue Oct 28 23:27:32 PDT 2014