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