Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  2 01:38:34 PDT 2014