Sync'd branch releases/aurora with upstream @ Mon Sep 15 14:43:31 PDT 2014