Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 15 21:54:38 PDT 2014