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