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