Sync'd branch releases/beta with upstream @ Mon Sep 22 10:57:30 PDT 2014