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