Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 16 04:29:15 PDT 2014