Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  9 12:01:42 PDT 2014