Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 16 08:28:40 PDT 2014