Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 13:44:41 PDT 2014