Sync'd branch releases/aurora with upstream @ Mon Sep 15 07:26:32 PDT 2014